From eb590e8487685f526dd764179635b02fbc1dc9ad Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 9 Jan 2006 16:54:04 +0000 Subject: [PATCH] Go back to the old key for attaching the action to the proxy. (#326288, MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2006-01-09 Matthias Clasen * gtk/gtkaction.c: Go back to the old key for attaching the action to the proxy. (#326288, Diego González) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkaction.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ce5115520b..73f0114644 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-09 Matthias Clasen + + * gtk/gtkaction.c: Go back to the old key for attaching the + action to the proxy. (#326288, Diego González) + 2006-01-08 Matthias Clasen * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ce5115520b..73f0114644 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-01-09 Matthias Clasen + + * gtk/gtkaction.c: Go back to the old key for attaching the + action to the proxy. (#326288, Diego González) + 2006-01-08 Matthias Clasen * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index a350b9eeb8..06b4f8054a 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -110,7 +110,7 @@ static void gtk_action_class_init (GtkActionClass *class); static GQuark accel_path_id = 0; static GQuark quark_gtk_action_proxy = 0; static const gchar accel_path_key[] = "GtkAction::accel_path"; -static const gchar gtk_action_proxy_key[] = "gtk-action-proxy"; +static const gchar gtk_action_proxy_key[] = "gtk-action"; GType gtk_action_get_type (void) -- 2.30.2